From: Roger Pau Monné <roger.pau@citrix.com>
Date: Tue, 6 Jun 2017 12:35:01 +0000 (+0200)
Subject: domctl/pt: remove hvm_domid field from bind struct
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2091
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=8fd8951eabc6648fc302585187d02d49157ff907;p=xen.git

domctl/pt: remove hvm_domid field from bind struct

This filed is unused and serves no purpose.

Reported-by: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
[jb: bump domctl interface version]
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index 00909ad470..a447405903 100644
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -1672,7 +1672,6 @@ int xc_domain_update_msi_irq(
     domctl.domain = (domid_t)domid;
 
     bind = &(domctl.u.bind_pt_irq);
-    bind->hvm_domid = domid;
     bind->irq_type = PT_IRQ_TYPE_MSI;
     bind->machine_irq = pirq;
     bind->u.msi.gvec = gvec;
@@ -1699,7 +1698,6 @@ int xc_domain_unbind_msi_irq(
     domctl.domain = (domid_t)domid;
 
     bind = &(domctl.u.bind_pt_irq);
-    bind->hvm_domid = domid;
     bind->irq_type = PT_IRQ_TYPE_MSI;
     bind->machine_irq = pirq;
     bind->u.msi.gvec = gvec;
@@ -1729,7 +1727,6 @@ static int xc_domain_bind_pt_irq_int(
     domctl.domain = (domid_t)domid;
 
     bind = &(domctl.u.bind_pt_irq);
-    bind->hvm_domid = domid;
     bind->irq_type = irq_type;
     bind->machine_irq = machine_irq;
     switch ( irq_type )
@@ -1788,7 +1785,6 @@ static int xc_domain_unbind_pt_irq_int(
     domctl.domain = (domid_t)domid;
 
     bind = &(domctl.u.bind_pt_irq);
-    bind->hvm_domid = domid;
     bind->irq_type = irq_type;
     bind->machine_irq = machine_irq;
     switch ( irq_type )
diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h
index e6cf211fe7..515c603dbc 100644
--- a/xen/include/public/domctl.h
+++ b/xen/include/public/domctl.h
@@ -37,7 +37,7 @@
 #include "hvm/save.h"
 #include "memory.h"
 
-#define XEN_DOMCTL_INTERFACE_VERSION 0x0000000d
+#define XEN_DOMCTL_INTERFACE_VERSION 0x0000000e
 
 /*
  * NB. xen_domctl.domain is an IN/OUT parameter for this operation.
@@ -559,7 +559,6 @@ typedef enum pt_irq_type_e {
 struct xen_domctl_bind_pt_irq {
     uint32_t machine_irq;
     pt_irq_type_t irq_type;
-    uint32_t hvm_domid;
 
     union {
         struct {